From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Mon, 21 Oct 2013 20:02:03 +0000 (-0400)
Subject: notificationDaemon: Fix loading/saving of notifications
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~3173
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=b54d512f3fed190171b68c7f8ca2935d5ba7f54f;p=gnome-shell.git

notificationDaemon: Fix loading/saving of notifications
---

diff --git a/js/ui/notificationDaemon.js b/js/ui/notificationDaemon.js
index 750657359..12ca9b8c1 100644
--- a/js/ui/notificationDaemon.js
+++ b/js/ui/notificationDaemon.js
@@ -856,7 +856,7 @@ const GtkNotificationDaemonAppSource = new Lang.Class({
             let notification = this._notifications[notificationId];
             notifications.push([notificationId, notification.serialize()]);
         }
-        return GLib.Variant.new('(sa(sv))', this._appId, notifications);
+        return [this._appId, notifications];
     },
 });
 
@@ -907,7 +907,7 @@ const GtkNotificationDaemon = new Lang.Class({
     _loadNotifications: function() {
         this._isLoading = true;
 
-        let value = global.get_persistent_state('a(sa(sa{sv}))', 'notifications');
+        let value = global.get_persistent_state('a(sa(sv))', 'notifications');
         if (value) {
             let sources = value.deep_unpack();
             sources.forEach(Lang.bind(this, function([appId, notifications]) {
@@ -940,7 +940,7 @@ const GtkNotificationDaemon = new Lang.Class({
             sources.push(source.serialize());
         }
 
-        global.set_persistent_state('notifications', GLib.Variant.new_array('a@(sa{sa{sv}})', sources));
+        global.set_persistent_state('notifications', new GLib.Variant('a(sa(sv))', sources));
     },
 
     AddNotificationAsync: function(params, invocation) {